From: John Tsichritzis <john.tsichritzis@arm.com>
Date: Fri, 7 Jun 2019 15:20:45 +0000 (+0000)
Subject: Merge "Neoverse N1: Introduce workaround for Neoverse N1 erratum 1315703" into integr... 
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=5441ed2463ef21bb26bbbc1a48b3866039eeb85e;p=project%2Fbcm63xx%2Fatf.git

Merge "Neoverse N1: Introduce workaround for Neoverse N1 erratum 1315703" into integration
---

5441ed2463ef21bb26bbbc1a48b3866039eeb85e
diff --cc lib/cpus/aarch64/neoverse_n1.S
index dadaf98b,3b8e8afb..d685b7e9
--- a/lib/cpus/aarch64/neoverse_n1.S
+++ b/lib/cpus/aarch64/neoverse_n1.S
@@@ -15,13 -15,8 +15,13 @@@
  #error "Neoverse N1 must be compiled with HW_ASSISTED_COHERENCY enabled"
  #endif
  
 +/* 64-bit only core */
 +#if CTX_INCLUDE_AARCH32_REGS == 1
 +#error "Neoverse-N1 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
 +#endif
 +
  /* --------------------------------------------------
-  * Errata Workaround for Neoverse N1 Errata
+  * Errata Workaround for Neoverse N1 Erratum 1043202.
   * This applies to revision r0p0 and r1p0 of Neoverse N1.
   * Inputs:
   * x0: variant[4:7] and revision[0:3] of current cpu.